[SECURITY] CVE-2023-6378 and CVE-2023-6481 fixes #1792
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Sean Li <lnse@amazon.com>
sejli
requested review from
ps48,
kavithacm,
derek-ho,
joshuali925,
dai-chen,
YANG-DB,
rupal-bq,
mengweieric,
vamsi-amazon,
Swiddis,
penghuo,
seankao-az and
anirudha
as code owners
Swiddis
approved these changes
Feb 6, 2024
sejli
added
security fix
joshuali925
approved these changes
Feb 6, 2024
|
The backport to To backport manually, run these commands in your terminal: # Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/observability/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/observability/backport-2.x
# Create a new branch
git switch --create backport/backport-1792-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 34f64904519b0f2d57eb3587ccbd1e58dc9a3ebb
# Push it to GitHub
git push --set-upstream origin backport/backport-1792-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/observability/backport-2.xThen, create a pull request where the |
|
The backport to To backport manually, run these commands in your terminal: # Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/observability/backport-2.12 2.12
# Navigate to the new working tree
pushd ../.worktrees/observability/backport-2.12
# Create a new branch
git switch --create backport/backport-1792-to-2.12
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 34f64904519b0f2d57eb3587ccbd1e58dc9a3ebb
# Push it to GitHub
git push --set-upstream origin backport/backport-1792-to-2.12
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/observability/backport-2.12Then, create a pull request where the |
sejli
added a commit
to sejli/observability
that referenced
this pull request
Feb 6, 2024
Signed-off-by: Sean Li <lnse@amazon.com> (cherry picked from commit 34f6490)
6 tasks
sejli
added a commit
to sejli/observability
that referenced
this pull request
Feb 6, 2024
Signed-off-by: Sean Li <lnse@amazon.com> (cherry picked from commit 34f6490)
6 tasks
joshuali925
pushed a commit
that referenced
this pull request
Feb 8, 2024
joshuali925
pushed a commit
that referenced
this pull request
Feb 8, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
ktlint:0.45.0contains problematiclogbacklibraries, bumpingktlintto0.47.1and resolving the breaking linter changes. Duplicate of #1791Issues Resolved
#1780 #1781
Check List
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.